Merge branch 'master' of git://git.denx.de/u-boot-avr32
authorWolfgang Denk <[email protected]>
Tue, 4 Sep 2012 07:17:27 +0000 (09:17 +0200)
committerWolfgang Denk <[email protected]>
Tue, 4 Sep 2012 07:17:27 +0000 (09:17 +0200)
* 'master' of git://git.denx.de/u-boot-avr32:
  net:macb: add line break
  avr32:portmux: fix setup for macb1
  avr32: Remove redundant LDSCRIPT definition

Signed-off-by: Wolfgang Denk <[email protected]>
1  2 
drivers/net/macb.c

Simple merge